Add emacs.res to .bzrignore

diff --git a/.bzrignore b/.bzrignore
index 3d0ef27a88847c6d41da1b57a20fd368f6d29f7c..8ceb328b8fe40b2e3e30ac4130037c872184d095 100644 (file)
--- a/.bzrignore
+++ b/.bzrignore
@@ -153,6 +153,7 @@ src/gdb.ini
 src/prefix-args*
 src/stamp-oldxmenu
 src/stamp-h.in
+src/emacs.res
 src/temacs
 test/indent/*.new
 +*

diff --git a/ChangeLog b/ChangeLog
index a88cae3240050537fed21de029775f257e4cfbd9..7588e29c27b785e22bdd553f25345bc263aeee52 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2012-12-10  Daniel Colascione  <dancol@dancol.org>
 
+       * .bzrignore: add src/emacs.res.
+
        * configure.ac (W32_RES, W32_RES_LINK, WINDRES): Teach the cygw32
        build how to compile Windows resource files; use these variables
        to tell src/Makefile.in how and whether to compile resources.